Added a few more unimplemented and untested features
Added a few more unimplemented and untested features
Get rid of some of the excessive comments