Removed debugging comments, added checkbox items