Couple additions + small changes