icon changed and some trivial fixes