fixed some issues
clean up