Big cleanup, fixeh headergen. testfiles better