20140920 - Removed scope attrib, other minor fixes