fixing basics