fixes + new features