changed the make file and a few style fixes;