Bug fixes, added loads more documentation comments, arranged filenames to match object names