FIXING A FEW MINOR FLAWS...