fixes and new features