Fixed huge bug...made a lot of changes.