messed some stuff up in last 2 commits, fixed