Missing imports in master header
Method an constant renaming.
Started adding some HeaderDoc comments.