cleaned build; fixed certain stupidities