Adding Layer labels
Fixing parsing bug
Many enhancements