Fixes and checked off by House