Update some docs, fix an "index not found" error and adjust syntax to current guidlines