Cleanup, documentation improvements, small fixes