Improvements, cleanups, and initial Level implementation