Updated to add indicator attributes, minor bugfixes