Ressy:
	- Fix error from using the scrollbar
	- Fix typos which were causing 'nil' errors
Teresa:
	- Copying ARL fix here
