Updated list stuff, fixed sys