add scout and minor fixes