fixed bugs / added stone compatibility