Fixed All bugs