better check scripts
misc
misc
cleanups