Resolved compile errors. Massaged the code.