Bug fixes + F13 problems & test cases.