Makes some more changes, fixes #3