Committing modifications anf fixes to build path and code