- added \pk, \sk
- removed commented out code
- added {}'s around some definitions