Fixed Stone Generator

Closes #310
Closes #313