#638, minor fixes & updates;