started fixing some warnings