Compant Tweaks

Nothing is fixed, just improved - work continues!