fixed less stuff and cleaned things up