Base vs Base mission done, more bugs fixed