minor changes; notes added as #warning message