bug fix, cleaned up labels