figures in
fixed some merge issues