Changes, and fixes