qualified Id's

fixed some formatting
added list of local ids