*add some ToDos
*fix some errors