knockout and minor fixes