fix all TODOs + including migrations