review and fix broken code