Tweaks to methods
Improvements to methods and finished algorithm