Use 32bit Int by default (as INT64 is not supported yet),
renamed TODO to NOTE,
added zFillCalback