more consts, prep for renaming files
Merge branch 'master' of https://github.com/xiagu/plotlines