Update

More fixes and addons