Map navigation works well, fix bombs