Lots Of Bug Fixes