Fix bugs. Still broken.