added comments and a toggle for status