Fixing latex refs and moving figures