Add a couple of check that should basically work

Don't forget to cleanup comments...