Fixed stuff and did stuff