updated new stuff

edits and bug fixes.