Controller commented and small changes