-- fixed notice errors, fatal error on grant page etc, GEP-50