Fixes and new features!