MORE fixing and Updating, and fail-safing

almost ready... everything works right now...