general fixes
Merge branch 'master' of https://github.com/maxisi/polHTC

changes to general and import