Some dot generation bugfixes and updates