Ship email and order conf mail updated and working, small bugs fixed