Some comments and UI fixes