some neato style changes, much js