Adds a few little refactorings / corrections

:q!
Merge branch 'master' of ssh://github.com/vis-kid/startup_dna

ipull merge:wq::q�kb�kbq~�kb!