several fixez towards beta release