some fixes and new features