fix errors, made stuff better