Fixify

Hi Thomas!

please review and either merge or send back to us for edits!

thanks
Peter & Dorrit