cleaned up, extra comments etc.
Final fixes
last fix