minor fixes still broken.