Build improvements + some fixes
Stone features now use Hannes' code, results are fairly good