added inspect methods
fixed merge issues