iSome more changed to keeper.go
* Still not complete, corner cases to fix for ring