Added >> and some fixes