embed done

embed and some cleaning...