Fixing up UI, adding comments and bumps