added a couple of things
Beautification stuff now going into play