Finishing edits for version 1.0 (demo version)