v1.5.1b various bug fixes.