Making the number of antennas configurable and fix the bugs that are related to this