compatibility fixes + new features + improvements