cleanup
fix fill outline color
cleanup