Reworked a few issues
Fixed irregularities with HarFactory