Lots of Bug fixes :)