gems update + small fixes