Changed some defaults and commented icon code.