cleaned up more stuff. fixed typos. followed through with on off options for all functions