Investment formula additions and debt fixes