upgrade to Pelican 3.5 and minor changes