adding some comments, still working on parser