Various fixs & Updates