Big Fixes. name parsing, divide by zero, timeouts