Fix some comments and remove invokeAll