Fix bugs, get working in general