Fixed bugs, task functionality complete