guide: various improvements and additions