Updates suggested by @pekrau and @remiolsen..

Thanks for the review everyone! I might ask you to do a big review of all written code when it gets a little more stable.. ;)