fixed some crazy stuff