Updating gems and bug fixes