PA-81 #comments: fixed some bugs