updates to make it actually work

Because it sucked before.