minor changes and todo update