WaterfallCave changes (father mostly)