a bit more work on style, update in gems