Director + Bugfixes