Cleaned Working Directory
Fixed some minor issues