Feature/lab review

more $api and $control fixes