Little additions and fixes