New gems + small fixes