fixed comments, ordering not working correctly