Smaller fixes to get things going. Time to push to the remote and see how it goes.