cleaned some mess, still a lot to do