more doc and cleanup