a bunch of cleanup and adding touch icons