pep8
haystack works
start refactoring
bugfixes
minor fixes
updated tests