cleaned up and merged some files.