added more uglifying stuff