Ready for release 2, now with more comments