Fix errors + formatting...