added new stuff, fixes #1