Random fixes

finally got "boss key" (escape) working, more commenting, moving
sections, better formatting