fix pop iceberg/mine/fish
debug random + refactoring