last fixes for implementing faye