various fixes, fm demo work
more fixes