adding gst and other small stuff