fixed some weird stuff