More testing and minor fixes