Improvements

:)