more updates and stylistic changesto the project