Fixes, new features (in dev)