+fixed some controller methods