Updates and Fix issues