list improvement (still buggy) + random fixes