Fix typos, check for errors when reaching limits