Bug fixed here and there