Update setup to AP, add market monitor, adjust heap functions