some fixes, beta version