additional bug fixes