Firstly, congratulations on your +HPT!

in regard to the EDD, yes its taken from your last period....maybe the best thing to do would be to make an appt with your GP and request a dating scan that way you will know exactly how far along you are