various debugging
style adjustments