fixing some misc issues