capitalize comments, rearrange code, add forward movement predicate map