Controller + small fixes