Capitalization and more improvements