minor setup tweaks... still lots of work needed...