Some cleaning up, still messy