Fixed couple of things that were missed out. Code compiles now.