Packet Handlers and few fixes