Fixed receiving erros and warnings, back on track