Add documentation / make standards compliant