i!8n fixes and some ocra leftovers.