some visual details fixed