Fixing some controller logic and updating readme