more changes
resolved some issues