cleaned up files, added some minor stuff