Clean up function calls greatly from the lua side
Add in real music (finally!)