moon, updated scripts a little