fixed some major weirdness!