Fixed minor problems with GRS-1. Added support in c&s.