Fixed some stuff. See issue #4