bugs fixed,