Cleaning out some todos and some warnings