Added sandtomb support plus minor changes