some fixes and gui v1.6