Small changes to list, added stack