both bugs fixed.