minor fixes, still broken