Sjs/fixes

better

:chicken: