Some more fixes, test cases. Interest probably works now.