Bit more fixing, still buggy