cleanups, and ui modification. xoxo