few updates and changes