improved visual style
fixed bugs