fix #1, add missing imports