Lots of bugfixes, typos and cleanup

yeah I wondered why you changed it, because it works fine :)

just keep in mind it doesn't work with count, only forEach also, count is faster than forEach, I noticed you changed some from count to forEach :(