resolved some bugs
added constant parameters, guardians and cleaned generics