yet more changes for gravMap build