Tweaking

Code is nearly ready for mass use.