Fixed a few errors... ALMOST ready to launch ch3