fixing minor issues and upgrade gems