closed several issues and cleaned up some of the uglier panics