fixed some s**t