adding more levels, and general clean up..