Some cleanup and add languages

Closes #15.