Initial commit, minor amendments