all mode now working
Commeted the code up a bit