Removed a couple of TODO's
fixed missing )