diff --git a/grc/hamnet70_demod_sc16qam.grc b/grc/hamnet70_demod_sc16qam.grc
index 5a2b818..addcc67 100644
--- a/grc/hamnet70_demod_sc16qam.grc
+++ b/grc/hamnet70_demod_sc16qam.grc
@@ -36,71 +36,135 @@ blocks:
   id: variable
   parameters:
     comment: ''
-    value: '[0.07597830170169104, -0.485565799912578, -0.8175675329652012, -0.08705845483279175,
-      0.8422499558933448, 0.8339672761862603, 0.5639986226766744, 0.8648579357306525,
-      0.8449626712400287, -0.14824742609024513, -0.839014751834186, -0.16052714055616374,
-      0.8461746738478428, 0.876699004960063, 0.5438574109711131, 0.8487497724723243,
-      0.901973957473885, -0.20608854557827685, -0.9237427266655129, 0.05657914223714758,
-      0.9244658087744888, 0.04699371313815648, -0.9078922909067606, -0.2143141706138818,
-      0.8906000008118203, 0.8703820417093556, 0.5269498118145474, 0.8744741132106794,
-      0.8951714615192253, -0.22348375942671786, -0.8928255879900311, 0.03052455222662204,
-      0.8525876862735934, 0.21700197016591458, -0.7648812444829712, -1.0877913873718514,
-      -0.7644834347657942, 0.21643221210655272, 0.8636472003816641, 0.01784265360684956,
-      -0.9039566593790512, -0.19720847977616437, 0.8683114899162668, 0.8868479082980585,
-      0.6404092867407761, 0.6568225109789249, 0.6624694331403292, 0.8628193131616877,
-      0.837852363582882, -0.12860147200310587, -0.874266046060146, -0.1397125213702271,
-      0.8617313892859799, 0.8365471578775032, 0.5956040882182279, 0.8221390022883328,
-      0.7681778127699552, 0.04511039330468456, -0.7314414499147517, -1.00914363652948,
-      -0.69255650622215, -0.00674900652370137, 0.6746184620556512, 1.0527665810823903,
-      0.7726368241443928, -0.19092892072381876, -0.7950968236154203, -0.186027302053198,
-      0.7812358777756694, 1.03818942039578, 0.6925283076118456, -0.020947352787426186,
-      -0.7789051309184633, -0.8343080373730677, -0.563711037581479, -0.8612923740231458,
-      -0.8665319687185258, 0.17029796271970854, 0.8159891988904876, 0.17319975656809514,
-      -0.7279801670404227, -1.09567867421579, -0.7585882059990467, 0.20918713334896463,
-      0.7726741082646805, 0.1930510198005684, -0.728560692857744, -1.1137407463348976,
-      -0.7472126518860863, 0.21357460848768628, 0.7717344911429374, 0.18885744657646908,
-      -0.7323441910313696, -1.104674088894687, -0.7679625570657318, 0.23666454512442675,
-      0.8508038023417438, 0.01276932958576111, -0.8845266294861591, -0.21444381674751473,
-      0.8586095453652112, 0.9155050626835117, 0.6092856462718013, 0.6722760775856454,
-      0.7701471297773871, 0.6539225174099268, 0.6302779977116016, 0.91090996468133,
-      0.8362594732977642, -0.18455939606545796, -0.8887179714994841, -0.013005158485466996,
-      0.9033103994723838, 0.19446514877164953, -0.866776436873287, -0.8865107735063715,
-      -0.6165664534570771, -0.6944400533786077, -0.7275728844384133, -0.6881540811334937,
-      -0.736412979084662, -0.683950646048729, -0.6496500909399723, -0.8500012951267402,
-      -0.7838311346696109, 0.0010927905014069478, 0.8016466380788749, 0.8190147792156793,
-      0.6025614719729334, 0.8228346005611357, 0.802787876393007, -0.003842004779830683,
-      -0.7753807311708878, -0.8552149342918304, -0.6664053831716811, -0.6591347883332134,
-      -0.7480549713000103, -0.6911855810423027, -0.6215407667183455, -0.8834482281221873,
-      -0.8679653913970135, 0.19240729701925668, 0.934116366440915, -0.05507762635239145,
-      -0.9481072897019951, -0.020323963798468382, 0.8894253424178579, 0.2166381550010981,
-      -0.7741079434916102, -1.0767523060604507, -0.7685461986012558, 0.21082602140258022,
-      0.8641896067442316, 0.022830556170658094, -0.8992821725529172, -0.20849132170440776,
-      0.8748402251802601, 0.8910516213413703, 0.6034003341368249, 0.7045419675600119,
-      0.7338568667875991, 0.6706647255835935, 0.7506755036294196, 0.6851592980678056,
-      0.610761208212266, 0.9016642779352577, 0.8332298109781053, -0.16286252640823884,
-      -0.83725250477382, -0.1474894987345423, 0.8180937445788066, 0.9027584846247846,
-      0.6310113259481372, 0.6610732581385319, 0.7464254443566228, 0.7004768060860638,
-      0.6921662697864044, 0.7302911658029473, 0.7181215430759254, 0.6628884046638914,
-      0.6786031876127859, 0.8380657910901609, 0.7696962141802574, 0.027277281671151603,
-      -0.8128754592694412, -0.8353236942051653, -0.558836706959898, -0.8649811113436121,
-      -0.8856478323656832, 0.20389097341321458, 0.8915890174142818, -0.009353179603650662,
-      -0.8649138828261284, -0.2245901872246641, 0.8069881214184643, 1.038231467104161,
-      0.6859513269034524, -0.013925921608002918, -0.768684581613136, -0.8523785186056687,
-      -0.5725147040610867, -0.8328530738565147, -0.89695683691402, 0.1849867554485682,
-      0.9316457953579594, -0.04448885337405751, -0.9440092680894189, -0.03770038141115751,
-      0.9299150217773825, 0.17970401267190714, -0.8881365621694067, -0.8369624937432751,
-      -0.5868508244688574, -0.8313092258450905, -0.7658074886689376, -0.03952153602497553,
-      0.7257002214449, 1.0102196812181568, 0.6948764376755145, 0.002866363543506209,
-      -0.6715870072815281, -1.0519218586041434, -0.777896506936374, 0.19672922787199323,
-      0.8053026272676543, 0.1596242561181449, -0.8137238460807423, -0.9215764973541457,
-      -0.6099189042595219, -0.6668473580346203, -0.7839911528474386, -0.6418964722093792,
-      -0.6554268264967297, -0.8849046342212495, -0.7317384814481425, -0.03259813363664732,
-      0.7055538541773647, 1.0248825368497154, 0.7268408407840553, -0.056954175409504405,
-      -0.7298952394033934, -0.8623881909077871, -0.6984645278411455, -0.6068937129219674,
-      -0.6939114111904727, -0.8671951461489478, -0.7334642243259445, -0.04799627890206296,
-      0.7250084426992481, 1.0172542273316627, 0.718341641051283, -0.039342105826704346,
-      -0.754313065831116, -0.8473572919418604, -0.636527393457419, -0.7287891872618689,
-      -0.7778654465178765]'
+    value: '[(0.07597830170169105+0.07597830170169105j), (-0.485565799912578-0.485565799912578j),
+      (-0.8175675329652012-0.8175675329652012j), (-0.08705845483279175-0.08705845483279175j),
+      (0.8422499558933448+0.8422499558933448j), (0.8339672761862602+0.8339672761862602j),
+      (0.5639986226766744+0.5639986226766744j), (0.8648579357306526+0.8648579357306526j),
+      (0.8449626712400288+0.8449626712400288j), (-0.14824742609024508-0.14824742609024508j),
+      (-0.8390147518341858-0.8390147518341858j), (-0.1605271405561638-0.1605271405561638j),
+      (0.8461746738478428+0.8461746738478428j), (0.8766990049600631+0.8766990049600631j),
+      (0.5438574109711132+0.5438574109711132j), (0.8487497724723242+0.8487497724723242j),
+      (0.9019739574738852+0.9019739574738852j), (-0.20608854557827674-0.20608854557827674j),
+      (-0.9237427266655129-0.9237427266655129j), (0.056579142237147585+0.056579142237147585j),
+      (0.9244658087744889+0.9244658087744889j), (0.04699371313815637+0.04699371313815637j),
+      (-0.9078922909067606-0.9078922909067606j), (-0.21431417061388186-0.21431417061388186j),
+      (0.8906000008118202+0.8906000008118202j), (0.8703820417093556+0.8703820417093556j),
+      (0.5269498118145475+0.5269498118145475j), (0.8744741132106792+0.8744741132106792j),
+      (0.8951714615192252+0.8951714615192252j), (-0.22348375942671783-0.22348375942671783j),
+      (-0.8928255879900311-0.8928255879900311j), (0.030524552226622117+0.030524552226622117j),
+      (0.8525876862735934+0.8525876862735934j), (0.21700197016591452+0.21700197016591452j),
+      (-0.7648812444829715-0.7648812444829715j), (-1.0877913873718512-1.0877913873718512j),
+      (-0.7644834347657942-0.7644834347657942j), (0.21643221210655267+0.21643221210655267j),
+      (0.8636472003816642+0.8636472003816642j), (0.017842653606849602+0.017842653606849602j),
+      (-0.9039566593790513-0.9039566593790513j), (-0.19720847977616426-0.19720847977616426j),
+      (0.8683114899162668+0.8683114899162668j), (0.8868479082980584+0.8868479082980584j),
+      (0.6404092867407761+0.6404092867407761j), (0.6568225109789249+0.6568225109789249j),
+      (0.6624694331403291+0.6624694331403291j), (0.8628193131616876+0.8628193131616876j),
+      (0.8378523635828818+0.8378523635828818j), (-0.12860147200310598-0.12860147200310598j),
+      (-0.8742660460601459-0.8742660460601459j), (-0.1397125213702271-0.1397125213702271j),
+      (0.86173138928598+0.86173138928598j), (0.8365471578775032+0.8365471578775032j),
+      (0.5956040882182277+0.5956040882182277j), (0.8221390022883328+0.8221390022883328j),
+      (0.7681778127699552+0.7681778127699552j), (0.04511039330468467+0.04511039330468467j),
+      (-0.7314414499147518-0.7314414499147518j), (-1.00914363652948-1.00914363652948j),
+      (-0.69255650622215-0.69255650622215j), (-0.006749006523701417-0.006749006523701417j),
+      (0.6746184620556512+0.6746184620556512j), (1.0527665810823903+1.0527665810823903j),
+      (0.772636824144393+0.772636824144393j), (-0.1909289207238188-0.1909289207238188j),
+      (-0.7950968236154201-0.7950968236154201j), (-0.18602730205319806-0.18602730205319806j),
+      (0.7812358777756695+0.7812358777756695j), (1.03818942039578+1.03818942039578j),
+      (0.6925283076118454+0.6925283076118454j), (-0.0209473527874262-0.0209473527874262j),
+      (-0.7789051309184634-0.7789051309184634j), (-0.8343080373730678-0.8343080373730678j),
+      (-0.5637110375814791-0.5637110375814791j), (-0.8612923740231458-0.8612923740231458j),
+      (-0.8665319687185258-0.8665319687185258j), (0.1702979627197086+0.1702979627197086j),
+      (0.8159891988904876+0.8159891988904876j), (0.17319975656809516+0.17319975656809516j),
+      (-0.7279801670404228-0.7279801670404228j), (-1.09567867421579-1.09567867421579j),
+      (-0.7585882059990467-0.7585882059990467j), (0.20918713334896466+0.20918713334896466j),
+      (0.7726741082646805+0.7726741082646805j), (0.19305101980056835+0.19305101980056835j),
+      (-0.728560692857744-0.728560692857744j), (-1.1137407463348976-1.1137407463348976j),
+      (-0.7472126518860862-0.7472126518860862j), (0.21357460848768628+0.21357460848768628j),
+      (0.7717344911429375+0.7717344911429375j), (0.1888574465764691+0.1888574465764691j),
+      (-0.7323441910313696-0.7323441910313696j), (-1.104674088894687-1.104674088894687j),
+      (-0.7679625570657318-0.7679625570657318j), (0.23666454512442675+0.23666454512442675j),
+      (0.8508038023417437+0.8508038023417437j), (0.012769329585761192+0.012769329585761192j),
+      (-0.8845266294861591-0.8845266294861591j), (-0.21444381674751473-0.21444381674751473j),
+      (0.8586095453652111+0.8586095453652111j), (0.9155050626835117+0.9155050626835117j),
+      (0.6092856462718014+0.6092856462718014j), (0.6722760775856454+0.6722760775856454j),
+      (0.7701471297773871+0.7701471297773871j), (0.6539225174099267+0.6539225174099267j),
+      (0.6302779977116018+0.6302779977116018j), (0.9109099646813298+0.9109099646813298j),
+      (0.8362594732977642+0.8362594732977642j), (-0.18455939606545796-0.18455939606545796j),
+      (-0.8887179714994841-0.8887179714994841j), (-0.01300515848546701-0.01300515848546701j),
+      (0.9033103994723839+0.9033103994723839j), (0.1944651487716495+0.1944651487716495j),
+      (-0.8667764368732869-0.8667764368732869j), (-0.8865107735063715-0.8865107735063715j),
+      (-0.6165664534570771-0.6165664534570771j), (-0.6944400533786077-0.6944400533786077j),
+      (-0.7275728844384133-0.7275728844384133j), (-0.688154081133494-0.688154081133494j),
+      (-0.736412979084662-0.736412979084662j), (-0.683950646048729-0.683950646048729j),
+      (-0.6496500909399724-0.6496500909399724j), (-0.85000129512674-0.85000129512674j),
+      (-0.7838311346696107-0.7838311346696107j), (0.001092790501406934+0.001092790501406934j),
+      (0.8016466380788749+0.8016466380788749j), (0.8190147792156796+0.8190147792156796j),
+      (0.6025614719729333+0.6025614719729333j), (0.8228346005611354+0.8228346005611354j),
+      (0.8027878763930072+0.8027878763930072j), (-0.0038420047798306553-0.0038420047798306553j),
+      (-0.7753807311708877-0.7753807311708877j), (-0.8552149342918305-0.8552149342918305j),
+      (-0.666405383171681-0.666405383171681j), (-0.6591347883332134-0.6591347883332134j),
+      (-0.7480549713000103-0.7480549713000103j), (-0.6911855810423028-0.6911855810423028j),
+      (-0.6215407667183456-0.6215407667183456j), (-0.8834482281221872-0.8834482281221872j),
+      (-0.8679653913970136-0.8679653913970136j), (0.19240729701925663+0.19240729701925663j),
+      (0.9341163664409152+0.9341163664409152j), (-0.05507762635239135-0.05507762635239135j),
+      (-0.9481072897019952-0.9481072897019952j), (-0.020323963798468313-0.020323963798468313j),
+      (0.8894253424178579+0.8894253424178579j), (0.21663815500109798+0.21663815500109798j),
+      (-0.7741079434916104-0.7741079434916104j), (-1.0767523060604505-1.0767523060604505j),
+      (-0.7685461986012556-0.7685461986012556j), (0.21082602140258022+0.21082602140258022j),
+      (0.8641896067442315+0.8641896067442315j), (0.022830556170658094+0.022830556170658094j),
+      (-0.899282172552917-0.899282172552917j), (-0.20849132170440776-0.20849132170440776j),
+      (0.8748402251802603+0.8748402251802603j), (0.8910516213413704+0.8910516213413704j),
+      (0.6034003341368249+0.6034003341368249j), (0.704541967560012+0.704541967560012j),
+      (0.7338568667875991+0.7338568667875991j), (0.6706647255835932+0.6706647255835932j),
+      (0.7506755036294195+0.7506755036294195j), (0.6851592980678055+0.6851592980678055j),
+      (0.6107612082122661+0.6107612082122661j), (0.9016642779352577+0.9016642779352577j),
+      (0.8332298109781054+0.8332298109781054j), (-0.162862526408239-0.162862526408239j),
+      (-0.83725250477382-0.83725250477382j), (-0.1474894987345422-0.1474894987345422j),
+      (0.8180937445788066+0.8180937445788066j), (0.9027584846247846+0.9027584846247846j),
+      (0.6310113259481374+0.6310113259481374j), (0.661073258138532+0.661073258138532j),
+      (0.7464254443566228+0.7464254443566228j), (0.7004768060860639+0.7004768060860639j),
+      (0.6921662697864045+0.6921662697864045j), (0.7302911658029474+0.7302911658029474j),
+      (0.7181215430759255+0.7181215430759255j), (0.6628884046638915+0.6628884046638915j),
+      (0.6786031876127858+0.6786031876127858j), (0.838065791090161+0.838065791090161j),
+      (0.7696962141802572+0.7696962141802572j), (0.027277281671151645+0.027277281671151645j),
+      (-0.8128754592694412-0.8128754592694412j), (-0.8353236942051655-0.8353236942051655j),
+      (-0.558836706959898-0.558836706959898j), (-0.864981111343612-0.864981111343612j),
+      (-0.8856478323656833-0.8856478323656833j), (0.2038909734132147+0.2038909734132147j),
+      (0.8915890174142816+0.8915890174142816j), (-0.009353179603650714-0.009353179603650714j),
+      (-0.8649138828261284-0.8649138828261284j), (-0.2245901872246641-0.2245901872246641j),
+      (0.8069881214184643+0.8069881214184643j), (1.0382314671041613+1.0382314671041613j),
+      (0.6859513269034524+0.6859513269034524j), (-0.013925921608002876-0.013925921608002876j),
+      (-0.7686845816131359-0.7686845816131359j), (-0.8523785186056686-0.8523785186056686j),
+      (-0.5725147040610868-0.5725147040610868j), (-0.8328530738565147-0.8328530738565147j),
+      (-0.8969568369140201-0.8969568369140201j), (0.18498675544856819+0.18498675544856819j),
+      (0.9316457953579594+0.9316457953579594j), (-0.04448885337405752-0.04448885337405752j),
+      (-0.9440092680894189-0.9440092680894189j), (-0.037700381411157564-0.037700381411157564j),
+      (0.9299150217773823+0.9299150217773823j), (0.17970401267190717+0.17970401267190717j),
+      (-0.8881365621694068-0.8881365621694068j), (-0.8369624937432751-0.8369624937432751j),
+      (-0.5868508244688574-0.5868508244688574j), (-0.8313092258450906-0.8313092258450906j),
+      (-0.7658074886689374-0.7658074886689374j), (-0.0395215360249756-0.0395215360249756j),
+      (0.7257002214448999+0.7257002214448999j), (1.0102196812181568+1.0102196812181568j),
+      (0.6948764376755147+0.6948764376755147j), (0.002866363543506195+0.002866363543506195j),
+      (-0.671587007281528-0.671587007281528j), (-1.0519218586041432-1.0519218586041432j),
+      (-0.7778965069363739-0.7778965069363739j), (0.19672922787199323+0.19672922787199323j),
+      (0.8053026272676546+0.8053026272676546j), (0.15962425611814487+0.15962425611814487j),
+      (-0.8137238460807423-0.8137238460807423j), (-0.9215764973541457-0.9215764973541457j),
+      (-0.609918904259522-0.609918904259522j), (-0.6668473580346201-0.6668473580346201j),
+      (-0.7839911528474385-0.7839911528474385j), (-0.6418964722093792-0.6418964722093792j),
+      (-0.6554268264967297-0.6554268264967297j), (-0.8849046342212495-0.8849046342212495j),
+      (-0.7317384814481425-0.7317384814481425j), (-0.03259813363664732-0.03259813363664732j),
+      (0.7055538541773648+0.7055538541773648j), (1.0248825368497154+1.0248825368497154j),
+      (0.7268408407840553+0.7268408407840553j), (-0.056954175409504475-0.056954175409504475j),
+      (-0.7298952394033935-0.7298952394033935j), (-0.862388190907787-0.862388190907787j),
+      (-0.6984645278411455-0.6984645278411455j), (-0.6068937129219674-0.6068937129219674j),
+      (-0.6939114111904727-0.6939114111904727j), (-0.8671951461489478-0.8671951461489478j),
+      (-0.7334642243259445-0.7334642243259445j), (-0.04799627890206295-0.04799627890206295j),
+      (0.7250084426992481+0.7250084426992481j), (1.0172542273316627+1.0172542273316627j),
+      (0.7183416410512831+0.7183416410512831j), (-0.0393421058267044-0.0393421058267044j),
+      (-0.754313065831116-0.754313065831116j), (-0.8473572919418604-0.8473572919418604j),
+      (-0.636527393457419-0.636527393457419j), (-0.7287891872618689-0.7287891872618689j),
+      (-0.7778654465178765-0.7778654465178765j)]'
   states:
     bus_sink: false
     bus_source: false
@@ -124,7 +188,7 @@ blocks:
   id: variable_constellation_rect
   parameters:
     comment: ''
-    const_points: '[1, -1]'
+    const_points: '[1+1j, -1-1j]'
     imag_sect: '2'
     precision: '8'
     real_sect: '2'
@@ -238,12 +302,20 @@ blocks:
   id: variable
   parameters:
     comment: ''
-    value: '[ -1, 1, 1, 1, -1, 1, 1, 1, -1, 1, -1, 1, 1, 1, -1, 1, -1, -1, 1, -1,
-      1, 1, 1, 1, -1, 1, 1, 1, -1, -1, 1, 1, -1, 1, 1, -1, -1, -1, 1, -1, -1, 1, -1,
-      -1, 1, -1, -1, 1, -1, 1, 1, 1, 1, 1, -1, 1, -1, -1, -1, -1, -1, -1, 1, 1, 1,
-      -1, -1, -1, -1, -1, 1, -1, 1, -1, -1, 1, -1, 1, 1, 1, 1, 1, 1, -1, 1, 1, 1,
-      1, 1, 1, 1, -1, -1, -1, 1, -1, 1, 1, -1, -1, -1, 1, -1, 1, -1, -1, -1, 1, 1,
-      -1, -1, 1, -1, -1, -1, -1, -1, 1, 1, -1, -1, -1, -1, 1, 1, -1, -1, -1]'
+    value: '[(-1-1j), (1+1j), (1+1j), (1+1j), (-1-1j), (1+1j), (1+1j), (1+1j), (-1-1j),
+      (1+1j), (-1-1j), (1+1j), (1+1j), (1+1j), (-1-1j), (1+1j), (-1-1j), (-1-1j),
+      (1+1j), (-1-1j), (1+1j), (1+1j), (1+1j), (1+1j), (-1-1j), (1+1j), (1+1j), (1+1j),
+      (-1-1j), (-1-1j), (1+1j), (1+1j), (-1-1j), (1+1j), (1+1j), (-1-1j), (-1-1j),
+      (-1-1j), (1+1j), (-1-1j), (-1-1j), (1+1j), (-1-1j), (-1-1j), (1+1j), (-1-1j),
+      (-1-1j), (1+1j), (-1-1j), (1+1j), (1+1j), (1+1j), (1+1j), (1+1j), (-1-1j), (1+1j),
+      (-1-1j), (-1-1j), (-1-1j), (-1-1j), (-1-1j), (-1-1j), (1+1j), (1+1j), (1+1j),
+      (-1-1j), (-1-1j), (-1-1j), (-1-1j), (-1-1j), (1+1j), (-1-1j), (1+1j), (-1-1j),
+      (-1-1j), (1+1j), (-1-1j), (1+1j), (1+1j), (1+1j), (1+1j), (1+1j), (1+1j), (-1-1j),
+      (1+1j), (1+1j), (1+1j), (1+1j), (1+1j), (1+1j), (1+1j), (-1-1j), (-1-1j), (-1-1j),
+      (1+1j), (-1-1j), (1+1j), (1+1j), (-1-1j), (-1-1j), (-1-1j), (1+1j), (-1-1j),
+      (1+1j), (-1-1j), (-1-1j), (-1-1j), (1+1j), (1+1j), (-1-1j), (-1-1j), (1+1j),
+      (-1-1j), (-1-1j), (-1-1j), (-1-1j), (-1-1j), (1+1j), (1+1j), (-1-1j), (-1-1j),
+      (-1-1j), (-1-1j), (1+1j), (1+1j), (-1-1j), (-1-1j), (-1-1j)]'
   states:
     bus_sink: false
     bus_source: false
diff --git a/grc/hamnet70_mod_sc16qam.grc b/grc/hamnet70_mod_sc16qam.grc
index bee9e8e..b75d6f5 100644
--- a/grc/hamnet70_mod_sc16qam.grc
+++ b/grc/hamnet70_mod_sc16qam.grc
@@ -96,7 +96,7 @@ blocks:
   id: variable_constellation_rect
   parameters:
     comment: ''
-    const_points: '[1, -1]'
+    const_points: '[1+1j, -1-1j]'
     imag_sect: '2'
     precision: '8'
     real_sect: '2'
@@ -159,12 +159,20 @@ blocks:
   id: variable
   parameters:
     comment: ''
-    value: '[ -1, 1, 1, 1, -1, 1, 1, 1, -1, 1, -1, 1, 1, 1, -1, 1, -1, -1, 1, -1,
-      1, 1, 1, 1, -1, 1, 1, 1, -1, -1, 1, 1, -1, 1, 1, -1, -1, -1, 1, -1, -1, 1, -1,
-      -1, 1, -1, -1, 1, -1, 1, 1, 1, 1, 1, -1, 1, -1, -1, -1, -1, -1, -1, 1, 1, 1,
-      -1, -1, -1, -1, -1, 1, -1, 1, -1, -1, 1, -1, 1, 1, 1, 1, 1, 1, -1, 1, 1, 1,
-      1, 1, 1, 1, -1, -1, -1, 1, -1, 1, 1, -1, -1, -1, 1, -1, 1, -1, -1, -1, 1, 1,
-      -1, -1, 1, -1, -1, -1, -1, -1, 1, 1, -1, -1, -1, -1, 1, 1, -1, -1, -1]'
+    value: '[(-1-1j), (1+1j), (1+1j), (1+1j), (-1-1j), (1+1j), (1+1j), (1+1j), (-1-1j),
+      (1+1j), (-1-1j), (1+1j), (1+1j), (1+1j), (-1-1j), (1+1j), (-1-1j), (-1-1j),
+      (1+1j), (-1-1j), (1+1j), (1+1j), (1+1j), (1+1j), (-1-1j), (1+1j), (1+1j), (1+1j),
+      (-1-1j), (-1-1j), (1+1j), (1+1j), (-1-1j), (1+1j), (1+1j), (-1-1j), (-1-1j),
+      (-1-1j), (1+1j), (-1-1j), (-1-1j), (1+1j), (-1-1j), (-1-1j), (1+1j), (-1-1j),
+      (-1-1j), (1+1j), (-1-1j), (1+1j), (1+1j), (1+1j), (1+1j), (1+1j), (-1-1j), (1+1j),
+      (-1-1j), (-1-1j), (-1-1j), (-1-1j), (-1-1j), (-1-1j), (1+1j), (1+1j), (1+1j),
+      (-1-1j), (-1-1j), (-1-1j), (-1-1j), (-1-1j), (1+1j), (-1-1j), (1+1j), (-1-1j),
+      (-1-1j), (1+1j), (-1-1j), (1+1j), (1+1j), (1+1j), (1+1j), (1+1j), (1+1j), (-1-1j),
+      (1+1j), (1+1j), (1+1j), (1+1j), (1+1j), (1+1j), (1+1j), (-1-1j), (-1-1j), (-1-1j),
+      (1+1j), (-1-1j), (1+1j), (1+1j), (-1-1j), (-1-1j), (-1-1j), (1+1j), (-1-1j),
+      (1+1j), (-1-1j), (-1-1j), (-1-1j), (1+1j), (1+1j), (-1-1j), (-1-1j), (1+1j),
+      (-1-1j), (-1-1j), (-1-1j), (-1-1j), (-1-1j), (1+1j), (1+1j), (-1-1j), (-1-1j),
+      (-1-1j), (-1-1j), (1+1j), (1+1j), (-1-1j), (-1-1j), (-1-1j)]'
   states:
     bus_sink: false
     bus_source: false
@@ -340,14 +348,16 @@ blocks:
   parameters:
     affinity: ''
     alias: ''
-    comment: ''
+    comment: 'Dirty hack: scale symbols up
+
+      by roughly sqrt(2)'
     dimension: '1'
     in_type: byte
     maxoutbuf: '0'
     minoutbuf: '0'
     num_ports: '1'
     out_type: complex
-    symbol_table: header_mod.points()
+    symbol_table: '[p*1.41 for p in header_mod.points()]'
   states:
     bus_sink: false
     bus_source: false
diff --git a/utils/filter_preamble.py b/utils/filter_preamble.py
index 85b8c09..9a376d8 100755
--- a/utils/filter_preamble.py
+++ b/utils/filter_preamble.py
@@ -4,9 +4,9 @@ import numpy as np
 import matplotlib.pyplot as pp
 import rrc
 
-pre = [ -1, 1, 1, 1, -1, 1, 1, 1, -1, 1, -1, 1, 1, 1, -1, 1, -1, -1, 1, -1, 1, 1, 1, 1, -1, 1, 1, 1, -1, -1, 1, 1, -1, 1, 1, -1, -1, -1, 1, -1, -1, 1, -1, -1, 1, -1, -1, 1, -1, 1, 1, 1, 1, 1, -1, 1, -1, -1, -1, -1, -1, -1, 1, 1, 1, -1, -1, -1, -1, -1, 1, -1, 1, -1, -1, 1, -1, 1, 1, 1, 1, 1, 1, -1, 1, 1, 1, 1, 1, 1, 1, -1, -1, -1, 1, -1, 1, 1, -1, -1, -1, 1, -1, 1, -1, -1, -1, 1, 1, -1, -1, 1, -1, -1, -1, -1, -1, 1, 1, -1, -1, -1, -1, 1, 1, -1, -1, -1]
+pre = np.array([ -1, 1, 1, 1, -1, 1, 1, 1, -1, 1, -1, 1, 1, 1, -1, 1, -1, -1, 1, -1, 1, 1, 1, 1, -1, 1, 1, 1, -1, -1, 1, 1, -1, 1, 1, -1, -1, -1, 1, -1, -1, 1, -1, -1, 1, -1, -1, 1, -1, 1, 1, 1, 1, 1, -1, 1, -1, -1, -1, -1, -1, -1, 1, 1, 1, -1, -1, -1, -1, -1, 1, -1, 1, -1, -1, 1, -1, 1, 1, 1, 1, 1, 1, -1, 1, 1, 1, 1, 1, 1, 1, -1, -1, -1, 1, -1, 1, 1, -1, -1, -1, 1, -1, 1, -1, -1, -1, 1, 1, -1, -1, 1, -1, -1, -1, -1, -1, 1, 1, -1, -1, -1, -1, 1, 1, -1, -1, -1]) * (1+1j)
 
-pre_up = np.zeros(2 * len(pre) + 1)
+pre_up = np.zeros(2 * len(pre) + 1, dtype=complex)
 
 pre_up[1::2] = pre
 
@@ -14,6 +14,10 @@ rrc_coef = rrc.rrc_design(150, 2)
 
 pre_flt = np.convolve(pre_up, rrc_coef, mode='same')
 
+print("===== Preamble =====")
+print(list(pre))
+
+print("===== Filtered Preamble =====")
 print(list(pre_flt))
 
 pp.plot(pre_up)