Fix stupid copy&paste error in boundaries and counting indices.
remove commented out code. We have versioncontrol...