cleanup root
update various gems, tweak code based on gem changes