Tested engine and director. Some bug fixes here and there