removing/unstaging a couple files and fixing minor bugs