Serial number added and other minor enhancements