add level2 solution
clean up a few bits