Elliptic curves over p-adic fields and their formal groups