fixed much shit