Minor fixes + todos
Memory order figures improved