More BS3
Various improvements
Merge branch 'master' of github.com:pcav/faunalia