Some hot-bugs fixed...