Todo's added and json files corrected