small tweaks; heureka added