Bug Fixes 2

Almost there....