Get fucking mentioned on @CLFN already

And get rid of some to-do tasks