Major Update

Updated most everything