Comments screen and misc. more minor updates