Latest updates

minor fixes