Small Item update

Few cosmetic updates and functional updates.