Updates and minor fixes