@fatbusinessman - made all the naming changes you've suggested. looks better now.