Fixed some small mistakes

Also, decided to omit the for-loop test for const.