Added store labels support and fixed some things