Added information and small bugfix