Added inspect dialog, other changes