some new types
Merge branch 'renneswork' of github.com:luca-penasa/spc into renneswork