Did this earlier but late post-

A couple fixes and re-typing lines of code