Fix small bugs. Many to go.