Add some gems from here and there

Thanks @Thoughtbot