better comments, fixed a few UI typos