fix #2, and small changes