In your previous review you pointed out 3 or 4 headers that should not be public. If you want we can sit down together and orginise the header in a proper way. I am not in a position to decide what is public and what is not :(