few updates & fixs