add comments/docblocks. fix visiblity. move class aliases