Clean-up, documentation, minor changes