more permalink stuff
commit
Fixed merge