some speedups and whatnot...