tweaks by andy
Various Tweaks

Under Testing