Fixed issue #1 and #2 and more bugfixing