#36 more bug fixes with permalinks
#36 more updates
#36 updates and fixes
#36 more fixes