Fix bugs? more bugs.