added some more, fixes #4