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