some library org improvements