fixed all kinds of stuff