makethes fixes, less bugs in make check-thes now