some final changes, before I revamp conditions and groups