lots o' fixes