additional bug fixes :)