First draft of better dot reading
Parser now accepts more cases