More testing + fixing