minor fiddling, still broken