Address bitmap comments
Use dict not list to refer by name not index