Fix a few issues. Still doesn't seem to work quite right.