continued bug fixes