1.2.3b - bug fixes