some fixes and more mission