Fixed things that didnt work