add display of rough-axis (red) and final2D angle black
fix merge problems