Added coral2
Misc. fixes