Added a couple of todo's. Current issue under linux, but will wont to check under Win as well.