another TODO
minor changes