Fixed up station so it can deal with non-straight stations better

Signed-off-by: Irmo van den Berge <bergerkiller@gmail.com>