some fixes
clean up