Tweaking some stuff
Updated the task finder