attempted bug fixes