Minor enhancements + ident package