fixed all the bugs, still more bugs though, so dont get silly about this