removed unncecessary includes
fixed exception::what modifiers