endpoints implementation, improvements