additions and small changes