Big update. Sorry, I could not keep track for all the changes :( I hope
this will not be repeated...