Updates from comments: cleanup unused code. Use PNG for asterisk.