Added lightweight version; minor changes.