Some additions and updates