More testing and minor modifications