offline tweaks

small tweaks that make working on HQ without internet a bit more pleasant

also one small functional change in d1f6991
great point - fixed