Updated Comments, Cleaned up, Added 'get' variables