various fixes n whatnot