Some more testing + fixing