1. comments now. 2. qa push, closes #18
also closes #6 too [seems that I forgot to before]