lots of fixes (can see all gems now)