Fixed most NaN problems.
Landmarks are now actually added....