bug fixes but still broken