Add gold and cleaned some stuff