fixed the previous commits, this one is complete i guess