Update

Fixes & features :)