more comment incorp and hopefully added tests