Fix/120 lightnings

This one should be rebased and deals with issues listed in #196