more cleanup + fixes

Harvesters and house terminal work now