removed blk_size from some of the prototypes since it is now
inside the fountain structure
Also some corrections and repair of omissions
an attempt to make more cross platform