minor changes, still broken code