Fixes and new features