fixes + visual improvement