updated comments
Added some testing