Fixes and new Level class