edit index
merged iss53 and hotfix