Changed comments, added interface