Some more improvements and features, now it should work