bugs fixed\!