Fixed minor iritations