moved demo here, fixes