Added weight to spoodle_date, some refac's