fixed UI and added commenting capabilities