- changed opening comments, removed TODO