moved author comments to proper locations