code cleanup

Removed warnings, small debugs---(no functional changes)