Check-In's are parsing okay. Also, fixed up some errors during the
command checking. Made everything a bit more robust and less easy to
break.