clean up docs, partial fix issue15