ok, this and the above are fixed