Updates, new features, more consistency