Polishing up some stuff
5 levels down. 3 to go, and ending