header / comments / bugfixes