Fixed list delete bug & other small stuff