Added some comment functionality and more docs