updated with last fixes for ffox