small issues

change header of rutines and names