Many fixes

:)