Tmp: Fix code and readme after first review