Some cosmetic improvements have been made