More comments for the UI class and more fixes: should be close to good now...