did some stuff. fixes #15. fixes #14