fixed some shit and shit