More lighthouse stuff

by Simon Hartmann