fixed weird stuff