fixed default values
fixing errors