Updates to documentation + come cleanup