small changes, still broken