Started improving logging, docs, etc