many minor fixes and visual improvements