- fixes + new feature