Various updated, performance updates and bug fixes
 Added a working directory which should be used in the future