Started in on cleaning, removed stray CRs, fixed crouch, fixed makefile for more general use