Cleaning up docblocks and adding various constants. WIP