added classes to prevent name conflicts
fixed stuff