fix dumbbugs from the cleanup