v1_1. Numerous minor refactoring changes