big update for FASD demo, and a few bug fixes/edits