Lander - closes #15 and other small fixes/improvements