removed prototype includes, updated comment blocks
more standardization of comment blocks