Added better caret rules

Thanks to @marclipovsky for the additions