Re-did the operator[]

Some of the commits before yours are from rebasing against master. The commit with the important changes is "Re-did the operator[]", which is after yours.