minor fixes

bug hunt gallore