Update Copyright!
Add a unit input, and fix some  bugs