fixed some issues
fixed some issues