Thanks toe, I'll work on the fixes