MORE BUGFIXES -__-