fixed some small details
fixed some small details