cleared ambiguities, included stdint for demos