misc documentations and clean ups