performance improvements & useability improvements