Add extpack comments and fix -s bug