Few updates

A few updates