Added item pickups!
Fixed trigger reference bug introduced in last commit.
Other minor changes.