Additions and small changes