lots of changes due to jekyll upgrade