Added tasks to complete, fixed returning of info
Removed faulty code