More testing
Even more testing and minor changes