some new stuff in the dev branch