lib changes: mostly convention stuff + some cleaning