Final fixups including bibliography