Fix errors, add more stuff.