Finishing up changes

Adding in changes from last meeting and things.