issue #15 done
issue #16
issue #13
issue #17
issue #18 a little bit