fixed most broken things