-added some comments, disabled an unneeded controller