bugs fixed on 06/04