minor updates and todo items