Small additions and changes