bugfixes / order references