Sdk enhancements

@antonbk @shunchu beat this up. I have braced myself. ;)
Indentation problems