Fixes
Fixed update handling and general cleanup