Fire temple framwork, various updates