morefixes

Conflicts:
	Dash_Part2_Test.java
more bugfixes
disable debug info