Lots of Updates and Fixes