Fix interface bugs, do lots of stuff I can't remember