Fix license header formatting
Addition of new combine/split and conversion methods
Minor improvements and fixes