Added plenty more consistencies and TODOs