Repaired end(). 
added todos