Some fixes to your repo

Merge this!