Various fixes

Hey,

Great project!
Here are various fixes.