small buggfixes
Merge branch 'dev' of https://github.com/kneeclass/Cornix into dev