Small additions and fixes..