done for today, fixed code