smaller fixes
PA-85 #comments: now working
PA-85 #comments: cleaning up