Minor changes/fixes, docs