minor optimizations - less dependence on Geometry
killed old
fixed a bug; added a bit of ranking stuff