several improvements and new features