Added Icon, Comments, and some Fixes.