added more docs; minor cleanup