final touches to make Collections work as Lists
style: fix nested else eclipse warning