Things and more things

Worked on and potentially fixed issue #4 and did other things as well