numerous issue fixes