Documentation added, cleanups