Changes for >> and << indenting

Also noted a minor bug
More key/function ideas