working out bugs, passing lab6 stuff again