jh - merged Jirakit's scenes and some updates to the collectitems script