Bug fixing and more verbose errors
Icon work and lots of bug fixes