first round of changes, added functionality, mostly aesthetic