7 bugs fixed, see issue #3