Update and Fixes

stuff