Copyright text + minor improvements