Small additions and fixes