A few changes, ready for production