closes #29 closes #1 & bugfix hacks