UPDATE: Fixes and other stuff