Lots of Bug Fixes