fixed a few minor bugs
Merge branch 'master' of https://github.com/oskanberg/frenchtoste
minor bug fixes