Fixed ALL DIRECTIVES
Fixed some problems in code