Changed delegate mode, added check for gstrings, cleaned source.
Fixed delegate code... again