add -o and -p opts, thaw consts