Some improvements; changed packet declaration...