added further todos