working thru bugs