some speedups and cleaning etc