Upgrade tycho 17->18;minor changes