More testing + fixes