Including changes from Chris McMacken

Thanks!