last fixes and doc