Slightly updated structure and fixed shrine entering/leaving.