fixed errors on Andis and Christians machines and cleaned up build files