Some more testing and minor fixes