Various fixes while real testing. Solves #11