minor changes and todo