random bug fixes