Working on lap info, fixed storage bugs