Lots of changes and the canges made for the pre1b.. working on fixing more bugs