fixs & updates