formatting and pre-release bug fixing