changed omake configuration, an example of pimpl and other modifications