fixes and to-dos