Fixed some stuff, basically perfected market