Minor bugfixes and output timing