removed some comments, changed sNapZ to Napon, fixed contributions