Updates for commenting/documentation and automatic testing