more gem improvements