minor fixes WORKING