fixing some last stuff