fixed some issues with previous checkin: