cleanup
changed a bunch of things, still need to update manual
Adding new files