Updates working

Might have exposed algorithm bugs