updated with a bunch of new stuff

mucho cleaner - more things added