Fixes and leveling