proposed fixes for some of the exceptions/bugs