fsk fixes - compiles, untested