dealt with some code review feedback
fixed spacing
whoops
Merge branch '7.x-FLVC-18' into 7.x-FLVC-15
cleaning up and consolidating permissions
cleaned up access functions and callbacks + formatted text nicer