bug fixes; update for new gems