fixed 2 bugs in pa2