Added new features, minor fixes