fixes and todo