few updates to fix errors