bugs fixed;