FWAC Mods and Bug Fixes