More Set.xml text clean-up
#60 Fix for Inconsistent state issues with markers

changed the remoteCall to use c.controller and harmonized the rest of
the automated calls.