review and fix sad. hope you're fine with all changes @mweibel :)