Tweaking algorithms
More docs
addressing warnings