Fixed some minor jshint issues.
Fixed state position on 'first' messages