Feature/lab review

fixes for directives labs