Minor changes and docs updates