Added temp definitions for func names;
Fixed Labels that were too long