style fix, deleted update() routine, updated TODO list