Bux fix and complete doc