Minor changes to finalize version 1