Added Factory & GUI fixes