SO many fixes...