bug fixes :relieved: