mspot: store models now, fix
clean up