invader + some fixes