Added comments, slight UI change, some code cleanup