fixes on general controller