cleaned up fx, added fxdemo