pull request 3

Lots of these updates are fasd demo related, so be aware that all files might not be used.