Some todos and file location fixes