VOYEUR: Remove a couple of useless variables, change type of some other to use booleans, add CHECKME