merged in russ's changes, build .swfs