-Weverything fixes