fixes fixes and fixes

:)