more todos and various fixes