[changed] few bugs fixed in header