Updates and docs fixes