comments and slight UI changes