fixes and many new features