Adjustments for Johns init stuff,
 -Erik
5 files changed