Cleanup of try-catches, rename of stone->state