Elk/pr/183

First few updates, before I even dare to run it. ;)