Added STI for debt subclasses.
Small big fixes