Correct constness in certain areas and add QOL improvements.