A lot of Bug Fixes