Tracking done ex:order seen and order requested
took care of some minor bugs