Numerous fixes
Got rid of unnecssary files