Fixed just about everything