Some minor improvements have been implemented