fix terrible looking stuff