fixed those unfinished parts