Fixes & little improvements