started main, changed a few returns