Added some feedback

@slead added TODO:. Pull request should help you find them. Happy to provide more feedback after you;ve digested my remarks.