1. Changing configuration mechanism. 2. Moving demos out to shell scripts.