Few bugs ironed out