fixed some controller issues