ladyofthelake and some light refactors