Add peeking and fix some spaces not being tabs