Fixed weird stuff