fix #1; finish martini