last fixes for beta 1