fix small bugs
little change in interface