Updates and Fixes

Some more stuff