More stone refactoring

And accidental performance improvements? o_O need confirmation on that though, I only have a single case to go by (my own computer ;) )