Today's updates

Added some exceptions
Cleaned up Path