Fixed comments, this time it really is working, no kidding...