clean, fix some issues