removed some huge goofs and back on track