Fixes Algorithm #14
Fixes Algorithm #24
Adds Algorithm #25