removed todo notes and fixes some syntax errors