Fixed some refs and figure issues