Minor cleaning up and upgraded gems.