Big update.

Got rid of some unneeded lines mostly